From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 14 Jul 2021 21:16:10 +0000 (+0200)
Subject: ci: Funnel package list to be built correctly
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~574^2^2~207
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=37a6434a4d868ac6a8a137d4008c363a40a9c70d;p=gnome-shell.git

ci: Funnel package list to be built correctly

It was on one hand using multi-line piping (`|`) and trying to
compensate with \ to escape multiple lines, this lead to:

  No match for argument: \

Also, the quoting around pkgconfig() arguments would lead to
double quoting at the shell level, thus:

  No match for argument: 'pkgconfig(gio-2.0)'

Fix both by using multi-line-turns-single-line piping (`>`)
and dropping the unnecessary quotes.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1913>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 963b7885d..f56975ec8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,10 +50,10 @@ workflow:
         FDO_DISTRIBUTION_VERSION: 34
         FDO_DISTRIBUTION_TAG: '2021-07-07.1'
         FDO_UPSTREAM_REPO: GNOME/gnome-shell
-        FDO_DISTRIBUTION_PACKAGES: |
-            findutils mozjs78-devel nodejs npm meson \
-            'pkgconfig(gio-2.0)' 'pkgconfig(gio-unix-2.0)' \
-            'pkgconfig(gnome-autoar-0)' 'pkgconfig(json-glib-1.0)'
+        FDO_DISTRIBUTION_PACKAGES: >
+            findutils mozjs78-devel nodejs npm meson
+            pkgconfig(gio-2.0) pkgconfig(gio-unix-2.0)
+            pkgconfig(gnome-autoar-0) pkgconfig(json-glib-1.0)
         FDO_DISTRIBUTION_EXEC: |
             # For static analysis with eslint
             npm install -g eslint &&